grabHelper: Use focus_default_window

This prevents us from having to track the previously focused window.

https://bugzilla.gnome.org/show_bug.cgi?id=689653

diff --git a/js/ui/grabHelper.js b/js/ui/grabHelper.js
index 3623a0f662cd0aa64ec822d953991b0915163cfc..f6b11ccdd3b576f5d3568e957b66ea3850bc9241 100644 (file)
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -204,7 +204,6 @@ const GrabHelper = new Lang.Class({
 
             this._grabbedFromKeynav = hadFocus;
             this._preGrabInputMode = global.stage_input_mode;
-            this._prevFocusedWindow = metaDisplay.focus_window;
 
             if (this._preGrabInputMode == Shell.StageInputMode.NONREACTIVE ||
                 this._preGrabInputMode == Shell.StageInputMode.NORMAL) {
@@ -243,13 +242,7 @@ const GrabHelper = new Lang.Class({
                 global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
         }
 
-        if (this._prevFocusedWindow) {
-            let metaDisplay = global.screen.get_display();
-            if (!metaDisplay.focus_window) {
-                metaDisplay.set_input_focus_window(this._prevFocusedWindow,
-                                                   false, global.get_current_time());
-            }
-        }
+        global.screen.focus_default_window(global.get_current_time());
     },
 
     // ignoreRelease: